Add util.h to various build files.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd095174038d20780e90e88b1ab0832057d42a57..9b47269f021139862a65e29448ea721e1c46f1ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,6 +149,7 @@ set(HEADERS
   session.h
   shapelib/shapefil.h
   strptime.h
+  units.h
   xcsv.h
   xmlgeneric.h
   zlib/crc32.h

diff --git a/Makefile.in b/Makefile.in
index fa7828deca46baacba411145a8b807bfda41d91c..7b33e2a7d4ac22310e2854414efee0f0dcc87691 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -778,7 +778,7 @@ jtr.o: jtr.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
 kml.o: kml.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
   gbfile.h session.h src/core/datetime.h src/core/optional.h grtcirc.h \
   src/core/file.h src/core/xmlstreamwriter.h src/core/xmltag.h \
-  xmlgeneric.h
+  units.h xmlgeneric.h
 lmx.o: lmx.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
   gbfile.h session.h src/core/datetime.h src/core/optional.h \
   xmlgeneric.h
@@ -980,7 +980,7 @@ unicsv.o: unicsv.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
   jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h garmin_tables.h \
   src/core/logging.h src/core/textstream.h src/core/file.h
 units.o: units.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h \
-  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
+  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h units.h
 util.o: util.cc defs.h config.h zlib/zlib.h zlib/zconf.h cet.h inifile.h \
   gbfile.h session.h src/core/datetime.h src/core/optional.h \
   src/core/xmltag.h

diff --git a/cet_util.cc b/cet_util.cc
index 0e6970e7fce0c92321d2965d7fad78e6185b52e8..6b5666b9d9d8a0a85749dfec78e77decb766b2d9 100644 (file)
--- a/cet_util.cc
+++ b/cet_util.cc
@@ -83,7 +83,7 @@ static signed int
 cet_cs_alias_qsort_cb(const void* a, const void* b)
 {
   const auto* va = (const cet_cs_alias_t*) a;
-  const cet_cs_alias_t* vb = (const cet_cs_alias_t*) b;
+  const auto* vb = (const cet_cs_alias_t*) b;
   return case_ignore_strcmp(va->name, vb->name);
 }